<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
	pageEncoding="ISO-8859-1"%>
<%@ taglib prefix="s" uri="/struts-tags"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>My Virtual Library</title>
<link rel="stylesheet" href="style.css" type="text/css" charset="utf-8" />

</head>

<body>

<div id="wrapper">
<h1><em>MyVirtual</em> Library</h1>

<div id="nav">
<ul>
	<li><a href="LogoutUser.action"><span>01</span> LOGOUT </a></li>
	<li><a href="EditAccount.action"><span>02</span> ACCOUNT </a></li>
	<li><a href="http://www.freewebsitetemplates.com"><span>03</span>
	LIBRARY</a></li>
	<li><a href="mainFriend.jsp"><span>04</span> FRIENDS </a></li>
	<li><a href="http://www.freewebsitetemplates.com"><span>05</span>
	CONTACTS</a></li>
</ul>
</div>
<div id="topcon">
<div id="topcon-inner">
<h2>Welcome to MyVirtual Library</h2>
<<<<<<< .mine
<p><jsp:include page="description.jsp" /></p>


</div>
</div>
<<<<<<< .mine
  <div id="content">
      <div id="body">
       <!-- add object form -->
        <s:form title="Add Item to your library" action="AddItem.action" method="POST" >
                
                <s:textfield name="book.title" label="Title"/>
                <s:radio label="Type" name="book.type" list="{'Book','CD','Dvd'}"/>
                <s:textfield name="book.location" label="Location"/>
                <s:submit value="Add Book" align="center"/>
                <br/><br/>
        </s:form>
            
        <div class="box" id="news">
          <div class="box-t"><div class="box-r"><div class="box-b"><div class="box-l">
          <div class="box-tr"><div class="box-br"><div class="box-bl"><div class="box-tl">
=======
</div>

<div id="content">
<div id="body">
<div class="left"><img src="images/oldlib.jpg" width="300"
	height="200"/></div>
<div class="right">
<p>Now the work really needs to start!</p>
</div>
>>>>>>> .r40

<<<<<<< .mine
            <h2>NEWS &amp; EVENTS</h2>

            <h3>05.03.2007</h3>
             <p>Even more websites all about website templates on <a href="http://www.justwebtemplates.com">Just Web Templates</a>.</p>
            <p class="more"><a href="http://www.freewebsitetemplates.com">more...</a></p>

=======
>>>>>>> .r40
            <div class="hr-yellow"> </div>

            <h3>05.03.2007</h3>
            <p>If you're looking for beautiful and professionally made templates you can find them at <a href="http://www.templatebeauty.com">Template Beauty</a>.</p>
			<p>If you're having problems editing the template please don't hesitate to ask for help on <a href="http://www.freewebsitetemplates.com/forum/">the forum</a>.</p>
            <p class="more"><a href="http://www.freewebsitetemplates.com">more...</a></p>

          </div></div></div></div>
          </div></div></div></div>
        </div>
        <div class="box" id="hits">
          <div class="box-t"><div class="box-r"><div class="box-b"><div class="box-l">
          <div class="box-tr"><div class="box-br"><div class="box-bl"><div class="box-tl">

            <h2>HIT'S LIST</h2>

            <h3>movie hits</h3>
            <img src="images/pic_1.jpg" width="63" height="91" alt="Pic 1" class="right" />
            <ul>
              <li><a href="http://www.freewebsitetemplates.com">Lorem ipsum dolor s........</a></li>
              <li><a href="http://www.freewebsitetemplates.com">Vivamus lobortis p........ </a></li>
              <li><a href="http://www.freewebsitetemplates.com">Sit amet, consectetu.......</a></li>
              <li><a href="http://www.freewebsitetemplates.com">Lorem ipsum dolor s........</a></li>
              <li><a href="http://www.freewebsitetemplates.com">Vivamus lobortis p........ </a></li>
            </ul>
            
            <div class="hr-yellow"> </div>
            
            <h3>album hist</h3>
            <img src="images/pic_2.jpg" width="63" height="81" alt="Pic 2" class="right" />
            <ul>
              <li><a href="http://www.freewebsitetemplates.com">Vivamus lobortis p........ </a></li>
              <li><a href="http://www.freewebsitetemplates.com">Lorem ipsum dolor s........</a></li>
              <li><a href="http://www.freewebsitetemplates.com">Vivamus lobortis p........ </a></li>
              <li><a href="http://www.freewebsitetemplates.com">Sit amet, consectetu.......</a></li>
            </ul>
            
          </div></div></div></div>
          </div></div></div></div>
        </div>
        <div class="box" id="new">
          <div class="box-t"><div class="box-r"><div class="box-b"><div class="box-l">
          <div class="box-tr"><div class="box-br"><div class="box-bl"><div class="box-tl">

            <h2>NEW RELEASES</h2>
            
            <h3>eestas sed</h3>
            <img src="images/pic_3.jpg" width="66" height="52" alt="Pic 3" class="right" />
            <p>porta vel, nulla. Maecenas condi- mentum sollicitu</p>
            
            <h3>Maecenas</h3>
            <img src="images/pic_4.jpg" width="66" height="52" alt="Pic 4" class="right" />
            <p>ndimentum sollicitudin quam. Sed convallis</p>
            
            <h3>sollicitudin</h3>
            <img src="images/pic_5.jpg" width="66" height="52" alt="Pic 5" class="right" />
            <p>quam. Sed nvallis lacus .vallislacus arcu.vallis</p>
            
          </div></div></div></div>
          </div></div></div></div>
        </div>
        <div class="clear"> </div>
      </div>
<jsp:include page="footer.html" />
</div></div>
</body>
</html>
